Merge branch 'develop'

Notification/MailMailjetNotification.php

                 $merchantCurrent,
                 MerchantSettingDefinition::SETTING_EMAIL_FROM_NAME
         );
-        $emailFromName = isset($params[self::FROM_NAME]) ?? $merchantConfigEmailFromName;
+        $emailFromName = isset($params[self::FROM_NAME]) ? $params[self::FROM_NAME] : $merchantConfigEmailFromName;
 
         $merchantConfigEmailSubjectPrefix = $this->settingSolver->getSettingValue(
                 $merchantCurrent,
                 MerchantSettingDefinition::SETTING_EMAIL_SUBJECT_PREFIX
         );
-        $emailSubjectPrefix = isset($params[self::SUBJECT_PREFIX]) ?? $merchantConfigEmailSubjectPrefix;
+        $emailSubjectPrefix = isset($params[self::SUBJECT_PREFIX]) ? $params[self::SUBJECT_PREFIX] : $merchantConfigEmailSubjectPrefix;
         if ($emailSubjectPrefix && strlen($emailSubjectPrefix)) {
             $emailSubjectPrefix .= ' ';
         }