From c105a16e6e3e678720917406f778aba755e1a597 Mon Sep 17 00:00:00 2001
From: Sergii Kovalenko <skovalenko@magento.com>
Date: Mon, 6 Jun 2016 13:42:42 +0300
Subject: [PATCH 01/11] MAGETWO-53134: Impossible resave customer on backend if
 he has address with optional state for country

---
 .../Magento/Customer/view/base/ui_component/customer_form.xml    | 1 +
 1 file changed, 1 insertion(+)

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 6ede18b0edf35..a3af626a0a46b 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
@@ -391,6 +391,7 @@
                 <item name="config" xsi:type="array">
                     <item name="dataType" xsi:type="string">text</item>
                     <item name="formElement" xsi:type="string">select</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/form/element/region</item>
                     <item name="source" xsi:type="string">address</item>
                     <item name="customEntry" xsi:type="string">region</item>
                     <item name="validation" xsi:type="array">

From 23103c03c527fe1ed3e1a3be691436818b7963fe Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Tue, 7 Jun 2016 18:15:25 +0300
Subject: [PATCH 02/11] MAGETWO-53010: [Email Logo] Saving a custom
 transactional email logo, failed.

---
 .../Model/Config/Backend/Email/Logo.php       |  3 ++
 .../Magento/Email/Model/AbstractTemplate.php  |  2 +-
 .../Email/Model/Design/Backend/Logo.php       | 33 +++++++++++++++++++
 app/code/Magento/Email/etc/di.xml             |  2 +-
 .../Theme/Model/Design/Backend/Logo.php       |  2 +-
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Email/Model/Design/Backend/Logo.php

diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php
index 701439ff2dbef..b88923a61730a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Config\Model\Config\Backend\Email;
 
+/**
+ * @deprecated
+ */
 class Logo extends \Magento\Config\Model\Config\Backend\Image
 {
     /**
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index eb9ed2ead8f50..4ce6f0d90a6cc 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -389,7 +389,7 @@ protected function getLogoUrl($store)
             $store
         );
         if ($fileName) {
-            $uploadDir = \Magento\Config\Model\Config\Backend\Email\Logo::UPLOAD_DIR;
+            $uploadDir = \Magento\Email\Model\Design\Backend\Logo::UPLOAD_DIR;
             $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
             if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
                 return $this->storeManager->getStore()->getBaseUrl(
diff --git a/app/code/Magento/Email/Model/Design/Backend/Logo.php b/app/code/Magento/Email/Model/Design/Backend/Logo.php
new file mode 100644
index 0000000000000..f315af490d241
--- /dev/null
+++ b/app/code/Magento/Email/Model/Design/Backend/Logo.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Email\Model\Design\Backend;
+
+use Magento\Theme\Model\Design\Backend\Logo as DesignLogo;
+
+class Logo extends DesignLogo
+{
+    /**
+     * The tail part of directory path for uploading
+     */
+    const UPLOAD_DIR = 'email/logo';
+
+    /**
+     * Upload max file size in kilobytes
+     *
+     * @var int
+     */
+    protected $maxFileSize = 2048;
+
+    /**
+     * Getter for allowed extensions of uploaded files
+     *
+     * @return string[]
+     */
+    public function getAllowedExtensions()
+    {
+        return ['jpg', 'jpeg', 'gif', 'png'];
+    }
+}
diff --git a/app/code/Magento/Email/etc/di.xml b/app/code/Magento/Email/etc/di.xml
index 5be5efeb0b678..d1477d470abd1 100644
--- a/app/code/Magento/Email/etc/di.xml
+++ b/app/code/Magento/Email/etc/di.xml
@@ -27,7 +27,7 @@
                 <item name="email_logo" xsi:type="array">
                     <item name="path" xsi:type="string">design/email/logo</item>
                     <item name="fieldset" xsi:type="string">other_settings/email</item>
-                    <item name="backend_model" xsi:type="string">Magento\Theme\Model\Design\Backend\Logo</item>
+                    <item name="backend_model" xsi:type="string">Magento\Email\Model\Design\Backend\Logo</item>
                     <item name="base_url" xsi:type="array">
                         <item name="type" xsi:type="string">media</item>
                         <item name="scope_info" xsi:type="string">1</item>
diff --git a/app/code/Magento/Theme/Model/Design/Backend/Logo.php b/app/code/Magento/Theme/Model/Design/Backend/Logo.php
index 78bc7603492ab..05b4bb9e2726f 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/Logo.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Logo.php
@@ -21,7 +21,7 @@ class Logo extends Image
      */
     protected function _getUploadDir()
     {
-        return $this->_mediaDirectory->getRelativePath($this->_appendScopeInfo(self::UPLOAD_DIR));
+        return $this->_mediaDirectory->getRelativePath($this->_appendScopeInfo(static::UPLOAD_DIR));
     }
 
     /**

From fe12b4dcf967f2c81b618489ce750ce0c8f02b81 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Wed, 8 Jun 2016 12:37:44 +0300
Subject: [PATCH 03/11] MAGETWO-51887: [GITHUB] Fatal error when page.messages
 block removed from xml #4127

---
 app/code/Magento/Customer/Controller/Account/Edit.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php
index db54956742ffb..e6b7667574d41 100644
--- a/app/code/Magento/Customer/Controller/Account/Edit.php
+++ b/app/code/Magento/Customer/Controller/Account/Edit.php
@@ -80,7 +80,6 @@ public function execute()
         $this->session->setChangePassword($this->getRequest()->getParam('changepass') == 1);
 
         $resultPage->getConfig()->getTitle()->set(__('Account Information'));
-        $resultPage->getLayout()->getBlock('messages')->setEscapeMessageFlag(true);
         return $resultPage;
     }
 }

From 2f32aed829a55cf7d5b42b7cc7b8cd43356bf16a Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Wed, 8 Jun 2016 12:53:43 +0300
Subject: [PATCH 04/11] MAGETWO-53010: [Email Logo] Saving a custom
 transactional email logo, failed.

---
 app/code/Magento/Email/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 5ef136daf489b..4d19d7abcbe72 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.22|~5.6.0|~7.0.0",
+        "magento/module-theme": "100.1.*",
         "magento/module-config": "100.1.*",
         "magento/module-store": "100.1.*",
         "magento/module-cms": "101.0.*",

From 362f62f3c9b6c2994070615d82efbdf19f15fe50 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Wed, 8 Jun 2016 18:08:11 +0300
Subject: [PATCH 05/11] MAGETWO-53628: JS error in the authentication-popup

---
 .../Block/Account/AuthenticationPopup.php     |  17 ++
 app/code/Magento/Customer/Model/Customer.php  |   2 +-
 .../Block/Account/AuthenticationPopupTest.php | 157 ++++++++++++++++++
 .../account/authentication-popup.phtml        |   1 +
 .../web/js/view/authentication-popup.js       |   2 +-
 5 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php

diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index 102e8bc5eebe8..5eb4f7fe055e0 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Customer\Block\Account;
 
+use Magento\Customer\Model\Form;
+use Magento\Store\Model\ScopeInterface;
+
 class AuthenticationPopup extends \Magento\Framework\View\Element\Template
 {
     /**
@@ -40,12 +43,26 @@ public function getJsLayout()
     public function getConfig()
     {
         return [
+            'autocomplete' => $this->isAutocompleteEnabled(),
             'customerRegisterUrl' => $this->getCustomerRegisterUrlUrl(),
             'customerForgotPasswordUrl' => $this->getCustomerForgotPasswordUrl(),
             'baseUrl' => $this->getBaseUrl()
         ];
     }
 
+    /**
+     * Is autocomplete enabled for storefront
+     *
+     * @return string
+     */
+    private function isAutocompleteEnabled()
+    {
+        return $this->_scopeConfig->getValue(
+            Form::XML_PATH_ENABLE_AUTOCOMPLETE,
+            ScopeInterface::SCOPE_STORE
+        ) ? 'on' : 'off';
+    }
+
     /**
      * Return base url.
      *
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index add7c10414667..84546eb31fc2c 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -1340,7 +1340,7 @@ public function getPasswordConfirm()
     }
 
     /**
-     * Return Password Confirmation
+     * Return Password
      *
      * @return string
      */
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
new file mode 100644
index 0000000000000..05f56d2570273
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Block\Account;
+
+use Magento\Customer\Block\Account\AuthenticationPopup;
+use Magento\Customer\Model\Form;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+class AuthenticationPopupTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var AuthenticationPopup */
+    private $model;
+
+    /** @var Context|\PHPUnit_Framework_MockObject_MockObject */
+    private $contextMock;
+
+    /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $storeManagerMock;
+
+    /** @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $scopeConfigMock;
+
+    /** @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $urlBuilderMock;
+
+    protected function setUp()
+    {
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMock();
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMock();
+        $this->urlBuilderMock = $this->getMockBuilder(UrlInterface::class)
+            ->getMock();
+
+        $this->contextMock->expects($this->once())
+            ->method('getStoreManager')
+            ->willReturn($this->storeManagerMock);
+        $this->contextMock->expects($this->once())
+            ->method('getScopeConfig')
+            ->willReturn($this->scopeConfigMock);
+        $this->contextMock->expects($this->once())
+            ->method('getUrlBuilder')
+            ->willReturn($this->urlBuilderMock);
+
+        $this->model = new AuthenticationPopup(
+            $this->contextMock
+        );
+    }
+
+    /**
+     * @param mixed $isAutocomplete
+     * @param string $baseUrl
+     * @param string $registerUrl
+     * @param string $forgotUrl
+     * @param array $result
+     *
+     * @dataProvider dataProviderGetConfig
+     */
+    public function testGetConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUrl, array $result)
+    {
+        $this->scopeConfigMock->expects($this->any())
+            ->method('getValue')
+            ->with(Form::XML_PATH_ENABLE_AUTOCOMPLETE, ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($isAutocomplete);
+
+        /** @var StoreInterface||\PHPUnit_Framework_MockObject_MockObject $storeMock */
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getBaseUrl'])
+            ->getMockForAbstractClass();
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with(null)
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->any())
+            ->method('getBaseUrl')
+            ->willReturn($baseUrl);
+
+        $this->urlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->willReturnMap(
+                [
+                    ['customer/account/create', [], $registerUrl],
+                    ['customer/account/forgotpassword', [], $forgotUrl],
+                ]
+            );
+
+        $this->assertEquals($result, $this->model->getConfig());
+    }
+
+    public function dataProviderGetConfig()
+    {
+        return [
+            [
+                0,
+                'base',
+                'reg',
+                'forgot',
+                [
+                    'autocomplete' => 'off',
+                    'customerRegisterUrl' => 'reg',
+                    'customerForgotPasswordUrl' => 'forgot',
+                    'baseUrl' => 'base',
+                ],
+            ],
+            [
+                1,
+                '',
+                'reg',
+                'forgot',
+                [
+                    'autocomplete' => 'on',
+                    'customerRegisterUrl' => 'reg',
+                    'customerForgotPasswordUrl' => 'forgot',
+                    'baseUrl' => '',
+                ],
+            ],
+            [
+                '',
+                'base',
+                '',
+                'forgot',
+                [
+                    'autocomplete' => 'off',
+                    'customerRegisterUrl' => '',
+                    'customerForgotPasswordUrl' => 'forgot',
+                    'baseUrl' => 'base',
+                ],
+            ],
+            [
+                true,
+                'base',
+                'reg',
+                '',
+                [
+                    'autocomplete' => 'on',
+                    'customerRegisterUrl' => 'reg',
+                    'customerForgotPasswordUrl' => '',
+                    'baseUrl' => 'base',
+                ],
+            ],
+        ];
+    }
+}
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 83d4bad447268..f7330686c54c1 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
@@ -5,6 +5,7 @@
  */
 
 // @codingStandardsIgnoreFile
+/** @var $block \Magento\Customer\Block\Account\AuthenticationPopup */
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup'" style="display: none;">
     <script>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
index 62ed03641b242..649238a81d1f7 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
@@ -23,7 +23,7 @@ define(
         return Component.extend({
             registerUrl: window.authenticationPopup.customerRegisterUrl,
             forgotPasswordUrl: window.authenticationPopup.customerForgotPasswordUrl,
-            autocomplete: window.checkout.autocomplete,
+            autocomplete: window.authenticationPopup.autocomplete,
             modalWindow: null,
             isLoading: ko.observable(false),
 

From 3e29e2257cda820598ccb8cadbc97985f8d23d25 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Wed, 8 Jun 2016 19:25:12 +0300
Subject: [PATCH 06/11] MAGETWO-49518: Fax can't be saved in Customer Account
 on Storefront

---
 app/code/Magento/Customer/Helper/Address.php  | 15 ++++++++++
 .../Customer/Test/Unit/Helper/AddressTest.php | 30 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 24722ebeef36d..e5a20d8f51761 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -373,4 +373,19 @@ public function isVatAttributeVisible()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * Retrieve attribute visibility
+     *
+     * @param string $code
+     * @return bool
+     */
+    public function isAttributeVisible($code)
+    {
+        $attributeMetadata = $this->_addressMetadataService->getAttributeMetadata($code);
+        if ($attributeMetadata) {
+            return $attributeMetadata->isVisible();
+        }
+        return false;
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
index 10c61358b143a..c5fd88021ef7d 100644
--- a/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
@@ -372,4 +372,34 @@ public function getFormatDataProvider()
             ['invalid_code', '']
         ];
     }
+
+    /**
+     * @param string $attributeCode
+     * @param bool $isMetadataExists
+     * @dataProvider isAttributeVisibleDataProvider
+     */
+    public function testIsAttributeVisible($attributeCode, $isMetadataExists)
+    {
+        $attributeMetadata = null;
+        if ($isMetadataExists) {
+            $attributeMetadata = $this->getMockBuilder(\Magento\Customer\Api\Data\AttributeMetadataInterface::class)
+                ->getMockForAbstractClass();
+            $attributeMetadata->expects($this->once())
+                ->method('isVisible')
+                ->willReturn(true);
+        }
+        $this->addressMetadataService->expects($this->once())
+            ->method('getAttributeMetadata')
+            ->with($attributeCode)
+            ->willReturn($attributeMetadata);
+        $this->assertEquals($isMetadataExists, $this->helper->isAttributeVisible($attributeCode));
+    }
+
+    public function isAttributeVisibleDataProvider()
+    {
+        return [
+            ['fax', true],
+            ['invalid_code', false]
+        ];
+    }
 }

From 11d2f7a2183ea2203629e616c640a3870ad025f6 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Thu, 9 Jun 2016 17:05:52 +0300
Subject: [PATCH 07/11] MAGETWO-48559: Useless email prefix is present on
 "Create/Edit Customer" Admin page

---
 app/code/Magento/Ui/view/base/ui_component/etc/definition.xml | 1 -
 1 file changed, 1 deletion(-)

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 105f6dd8dcd3b..823b312a9e687 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
@@ -344,7 +344,6 @@
                 <item name="component" xsi:type="string">Magento_Ui/js/form/element/abstract</item>
                 <item name="template" xsi:type="string">ui/form/field</item>
                 <item name="elementTmpl" xsi:type="string">ui/form/element/email</item>
-                <item name="addbefore" xsi:type="string">@email:</item>
             </item>
         </argument>
     </email>

From 46fdc3fe3bf7a87368cdfbf2a67af4048c5f2d79 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Fri, 10 Jun 2016 19:46:41 +0300
Subject: [PATCH 08/11] MAGETWO-54121: Can't create checkout after confirm
 customer account from email #4475

---
 .../Customer/Controller/Account/Confirm.php   | 48 ++++++++++++++++++-
 .../Unit/Controller/Account/ConfirmTest.php   | 37 +++++++++++++-
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 6708279fe7ce1..2db820806d642 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -49,6 +49,16 @@ class Confirm extends \Magento\Customer\Controller\AbstractAccount
      */
     protected $session;
 
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager
+     */
+    private $cookieMetadataManager;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -79,6 +89,38 @@ public function __construct(
         parent::__construct($context);
     }
 
+    /**
+     * Retrieve cookie manager
+     *
+     * @deprecated
+     * @return \Magento\Framework\Stdlib\Cookie\PhpCookieManager
+     */
+    private function getCookieManager()
+    {
+        if (!$this->cookieMetadataManager) {
+            $this->cookieMetadataManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Stdlib\Cookie\PhpCookieManager::class
+            );
+        }
+        return $this->cookieMetadataManager;
+    }
+
+    /**
+     * Retrieve cookie metadata factory
+     *
+     * @deprecated
+     * @return \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
+     */
+    private function getCookieMetadataFactory()
+    {
+        if (!$this->cookieMetadataFactory) {
+            $this->cookieMetadataFactory = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class
+            );
+        }
+        return $this->cookieMetadataFactory;
+    }
+
     /**
      * Confirm customer account by id and confirmation key
      *
@@ -104,7 +146,11 @@ public function execute()
             $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
             $customer = $this->customerAccountManagement->activate($customerEmail, $key);
             $this->session->setCustomerDataAsLoggedIn($customer);
-
+            if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {
+                $metadata = $this->getCookieMetadataFactory()->createCookieMetadata();
+                $metadata->setPath('/');
+                $this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
+            }
             $this->messageManager->addSuccess($this->getSuccessMessage());
             $resultRedirect->setUrl($this->getSuccessRedirect());
             return $resultRedirect;
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
index 280de574814f8..58a71aedc6b2d 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Customer\Test\Unit\Controller\Account;
 
+use Magento\Customer\Controller\Account\Confirm;
 use Magento\Customer\Helper\Address;
 use Magento\Customer\Model\Url;
 use Magento\Store\Model\ScopeInterface;
@@ -19,7 +20,7 @@
 class ConfirmTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Customer\Controller\Account\Confirm
+     * @var Confirm
      */
     protected $model;
 
@@ -307,6 +308,40 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
             ->method('getStore')
             ->will($this->returnValue($this->storeMock));
 
+
+
+        $cookieMetadataManager = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\PhpCookieManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadataManager->expects($this->once())
+            ->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(true);
+        $cookieMetadataFactory = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadata = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadataFactory->expects($this->once())
+            ->method('createCookieMetadata')
+            ->willReturn($cookieMetadata);
+        $cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->with('/');
+        $cookieMetadataManager->expects($this->once())
+            ->method('deleteCookie')
+            ->with('mage-cache-sessid', $cookieMetadata);
+
+        $refClass = new \ReflectionClass(Confirm::class);
+        $cookieMetadataManagerProperty = $refClass->getProperty('cookieMetadataManager');
+        $cookieMetadataManagerProperty->setAccessible(true);
+        $cookieMetadataManagerProperty->setValue($this->model, $cookieMetadataManager);
+
+        $cookieMetadataFactoryProperty = $refClass->getProperty('cookieMetadataFactory');
+        $cookieMetadataFactoryProperty->setAccessible(true);
+        $cookieMetadataFactoryProperty->setValue($this->model, $cookieMetadataFactory);
+
         $this->model->execute();
     }
 

From b7030c9968426ae26945742ab7c72aa606dd8029 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Mon, 13 Jun 2016 13:07:23 +0300
Subject: [PATCH 09/11] MAGETWO-54121: Can't create checkout after confirm
 customer account from email #4475

---
 .../Test/Unit/Controller/Account/ConfirmTest.php    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
index 58a71aedc6b2d..a26c947fa3d63 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
@@ -439,6 +439,19 @@ public function testSuccessRedirect(
             )
             ->willReturn($isSetFlag);
 
+        $cookieMetadataManager = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\PhpCookieManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadataManager->expects($this->once())
+            ->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(false);
+
+        $refClass = new \ReflectionClass(Confirm::class);
+        $refProperty = $refClass->getProperty('cookieMetadataManager');
+        $refProperty->setAccessible(true);
+        $refProperty->setValue($this->model, $cookieMetadataManager);
+
         $this->model->execute();
     }
 

From 36b3aaf3608bf9f0a9b2ce545cc2a115659b1d87 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Tue, 14 Jun 2016 15:09:04 +0300
Subject: [PATCH 10/11] MAGETWO-54179: Can't reset password from admin if
 customer was registered on custom website

---
 app/code/Magento/Customer/Model/EmailNotification.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
index bf7ff59105b1c..4f362ccada6e2 100644
--- a/app/code/Magento/Customer/Model/EmailNotification.php
+++ b/app/code/Magento/Customer/Model/EmailNotification.php
@@ -268,8 +268,7 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
     {
         if ($customer->getWebsiteId() != 0 && empty($defaultStoreId)) {
             $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
-            reset($storeIds);
-            $defaultStoreId = current($storeIds);
+            $defaultStoreId = reset($storeIds);
         }
         return $defaultStoreId;
     }
@@ -282,9 +281,9 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
      */
     public function passwordReminder(CustomerInterface $customer)
     {
-        $storeId = $this->storeManager->getStore()->getId();
+        $storeId = $this->getWebsiteStoreId($customer);
         if (!$storeId) {
-            $storeId = $this->getWebsiteStoreId($customer);
+            $storeId = $this->storeManager->getStore()->getId();
         }
 
         $customerEmailData = $this->getFullCustomerObject($customer);

From cb603ff3d9af3c1fc4375c588a6593e8f8dc40d3 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@magento.com>
Date: Fri, 17 Jun 2016 17:50:37 +0300
Subject: [PATCH 11/11] MAGETWO-53010: [Email Logo] Saving a custom
 transactional email logo, failed.

---
 app/code/Magento/Email/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 1a1b8a0a11779..3d4b46f429038 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
+        "magento/module-theme": "100.1.*",
         "magento/module-config": "100.1.*",
         "magento/module-store": "100.1.*",
         "magento/module-cms": "101.0.*",