🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17091: [Backport] Issue-13768 Fixed error messages on admin user account page after redirect for force password change (by @mageprince)
 - #15677: [Backport] Wrong Last orders amount on dashboard #15660 (by @ankurvr)


Fixed GitHub Issues:
 - #13768: Expired backend password - Attention: Something went wrong (reported by @janssensjelle) has been fixed in #17091 by @mageprince in 2.1-develop branch
   Related commits:
     1. 90a8bed

 - #15660: Wrong order amount on dashboard on Last orders listing when having more than one website with different currencies (reported by @ankurvr) has been fixed in #15677 by @ankurvr in 2.1-develop branch
   Related commits:
     1. 5a379fc
     2. 0deea0e
     3. 6b0f8d0
     4. 2594853

Author: Stanislav Idolov

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -70,10 +70,7 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
-            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-            'default'
-        );
+        $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
         $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 

app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php

@@ -108,6 +108,7 @@ public function execute(EventObserver $observer)
             'adminhtml_system_account_index',
             'adminhtml_system_account_save',
             'adminhtml_auth_logout',
+            'mui_index_render'
         ];
         /** @var \Magento\Framework\App\Action\Action $controller */
         $controller = $observer->getEvent()->getControllerAction();