Merge branch '2.3-develop' of github.com:magento-mpi/magento2ce into MPI-PR-23

Author: dyushkin

app/code/Magento/Store/Model/StoreSwitcher/ManagePrivateContent.php

@@ -38,9 +38,12 @@ public function __construct(
     }
 
     /**
+     * Update version of private content on each store switch.
+     *
      * @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 redirect url
      * @throws CannotSwitchStoreException
      */
@@ -54,7 +57,7 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
                 ->setHttpOnly(false);
             $this->cookieManager->setPublicCookie(
                 \Magento\Framework\App\PageCache\Version::COOKIE_NAME,
-                'should_be_updated',
+                \uniqid('updated-', true),
                 $publicCookieMetadata
             );
         } catch (\Exception $e) {