🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #15038: [2.1-develop][Backport] Transport variable can not be altered in email_invoice_set_template_vars_before Event (by @gwharton)


Fixed GitHub Issues:
 - #10210: Transport variable can not be altered in email_invoice_set_template_vars_before Event (reported by @diybook) has been fixed in #15038 by @gwharton in 2.1-develop branch
   Related commits:
     1. 9a95dae

Author: magento-engcom-team

app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php

@@ -13,6 +13,7 @@
 use Magento\Sales\Model\ResourceModel\Order as OrderResource;
 use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\DataObject;
 
 /**
  * Class OrderSender
@@ -127,14 +128,17 @@ protected function prepareTemplate(Order $order)
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
         ];
-        $transport = new \Magento\Framework\DataObject($transport);
+        $transportObject = new DataObject($transport);
 
+        /**
+         * Event argument `transport` is @deprecated. Use `transportObject` instead.
+         */
         $this->eventManager->dispatch(
             'email_order_set_template_vars_before',
-            ['sender' => $this, 'transport' => $transport]
+            ['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
         );
 
-        $this->templateContainer->setTemplateVars($transport->getData());
+        $this->templateContainer->setTemplateVars($transportObject->getData());
 
         parent::prepareTemplate($order);
     }