Calling getCurrentUrl on Store will wrongly add "___store"

Author: Nazar65

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

@@ -1164,11 +1164,12 @@ public function isDefault()
      * Retrieve current url for store
      *
      * @param bool $fromStore
+     * @param bool $clearUrl
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function getCurrentUrl($fromStore = true)
+    public function getCurrentUrl($fromStore = true, $clearUrl = false)
     {
         $sidQueryParam = $this->_sidResolver->getSessionIdQueryParam($this->_getSession());
         $requestString = $this->_url->escape(ltrim($this->_request->getRequestString(), '/'));
@@ -1217,6 +1218,10 @@ public function getCurrentUrl($fromStore = true)
 
         $currentUrlQueryParams = array_merge($requestString, $storeParsedQuery);
 
+        if ($clearUrl !== false) {
+            $currentUrlQueryParams = false;
+        }
+
         $currentUrl = $storeParsedUrl['scheme']
             . '://'
             . $storeParsedUrl['host']