maartenwolfsen

diff --git a/Service/ImageResize.php b/Service/ImageResize.php
--- a/Service/ImageResize.php
+++ b/Service/ImageResize.php
@@ -257,9 +257,37 @@
             ]
         );
 
+        if (isset($imageParams['watermark_file'])) {
+            if ($imageParams['watermark_height'] !== null) {
+                $image->setWatermarkHeight($imageParams['watermark_height']);

maartenwolfsen

diff --git a/Model/Config.php b/Model/Config.php
index 11ad1ef2a43e..424c47b7ef9a 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -227,13 +227,14 @@ private function getField(string $sectionId, string $groupId, string $fieldId):
      * Get field path
      *
      * @param Field $field
+     * @param string $fieldId Need for support of clone_field feature
      * @param array &$oldConfig Need for compatibility with _processGroup()

maartenwolfsen

diff --git a/Model/AccountManagement.php b/Model/AccountManagement.php
index 9173307a7d27..8beecffd1c86 100644
--- a/Model/AccountManagement.php
+++ b/Model/AccountManagement.php
@@ -681,8 +681,8 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
         $this->getAuthentication()->unlock($customer->getId());
-        $this->sessionManager->destroy();