diff --git a/vendor/magento/module-sales/Block/Order/Email/Creditmemo/Items.php b/vendor/magento/module-sales/Block/Order/Email/Creditmemo/Items.php
index 0b691eff575..0a1e87e5e0a 100644
--- a/vendor/magento/module-sales/Block/Order/Email/Creditmemo/Items.php
+++ b/vendor/magento/module-sales/Block/Order/Email/Creditmemo/Items.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\Sales\Block\Order\Email\Creditmemo;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Api\CreditmemoRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
 /**
  * Sales Order Email creditmemo items
  *
@@ -15,6 +22,36 @@ namespace Magento\Sales\Block\Order\Email\Creditmemo;
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var CreditmemoRepositoryInterface
+     */
+    private $creditmemoRepository;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param OrderRepositoryInterface|null $orderRepository
+     * @param CreditmemoRepositoryInterface|null $creditmemoRepository
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?OrderRepositoryInterface $orderRepository = null,
+        ?CreditmemoRepositoryInterface $creditmemoRepository = null
+    ) {
+        $this->orderRepository =
+            $orderRepository ?: ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+        $this->creditmemoRepository =
+            $creditmemoRepository ?: ObjectManager::getInstance()->get(CreditmemoRepositoryInterface::class);
+
+        parent::__construct($context, $data);
+    }
+
+    /**
      * Prepare item before output
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
@@ -25,4 +62,54 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
         $renderer->getItem()->setOrder($this->getOrder());
         $renderer->getItem()->setSource($this->getCreditmemo());
     }
+
+    /**
+     * Returns order.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So order is loaded by order_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return OrderInterface|null
+     */
+    public function getOrder()
+    {
+        $order = $this->getData('order');
+        if ($order !== null) {
+            return $order;
+        }
+
+        $orderId = (int)$this->getData('order_id');
+        if ($orderId) {
+            $order = $this->orderRepository->get($orderId);
+            $this->setData('order', $order);
+        }
+
+        return $this->getData('order');
+    }
+
+    /**
+     * Returns creditmemo.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So creditmemo is loaded by creditmemo_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return CreditmemoInterface|null
+     */
+    public function getCreditmemo()
+    {
+        $creditmemo = $this->getData('creditmemo');
+        if ($creditmemo !== null) {
+            return $creditmemo;
+        }
+
+        $creditmemoId = (int)$this->getData('creditmemo_id');
+        if ($creditmemoId) {
+            $creditmemo = $this->creditmemoRepository->get($creditmemoId);
+            $this->setData('creditmemo', $creditmemo);
+        }
+
+        return $this->getData('creditmemo');
+    }
 }
diff --git a/vendor/magento/module-sales/Block/Order/Email/Invoice/Items.php b/vendor/magento/module-sales/Block/Order/Email/Invoice/Items.php
index bc7756816d3..cc2b197ab0e 100644
--- a/vendor/magento/module-sales/Block/Order/Email/Invoice/Items.php
+++ b/vendor/magento/module-sales/Block/Order/Email/Invoice/Items.php
@@ -6,6 +6,13 @@
 
 namespace Magento\Sales\Block\Order\Email\Invoice;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Api\Data\InvoiceInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
 /**
  * Sales Order Email Invoice items
  *
@@ -15,6 +22,36 @@ namespace Magento\Sales\Block\Order\Email\Invoice;
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    private $invoiceRepository;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param OrderRepositoryInterface|null $orderRepository
+     * @param InvoiceRepositoryInterface|null $invoiceRepository
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?OrderRepositoryInterface $orderRepository = null,
+        ?InvoiceRepositoryInterface $invoiceRepository = null
+    ) {
+        $this->orderRepository =
+            $orderRepository ?: ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+        $this->invoiceRepository =
+            $invoiceRepository ?: ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
+
+        parent::__construct($context, $data);
+    }
+
+    /**
      * Prepare item before output
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
@@ -25,4 +62,54 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
         $renderer->getItem()->setOrder($this->getOrder());
         $renderer->getItem()->setSource($this->getInvoice());
     }
+
+    /**
+     * Returns order.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So order is loaded by order_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return OrderInterface|null
+     */
+    public function getOrder()
+    {
+        $order = $this->getData('order');
+        if ($order !== null) {
+            return $order;
+        }
+
+        $orderId = (int)$this->getData('order_id');
+        if ($orderId) {
+            $order = $this->orderRepository->get($orderId);
+            $this->setData('order', $order);
+        }
+
+        return $this->getData('order');
+    }
+
+    /**
+     * Returns invoice.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So invoice is loaded by invoice_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return InvoiceInterface|null
+     */
+    public function getInvoice()
+    {
+        $invoice = $this->getData('invoice');
+        if ($invoice !== null) {
+            return $invoice;
+        }
+
+        $invoiceId = (int)$this->getData('invoice_id');
+        if ($invoiceId) {
+            $invoice = $this->invoiceRepository->get($invoiceId);
+            $this->setData('invoice', $invoice);
+        }
+
+        return $this->getData('invoice');
+    }
 }
diff --git a/vendor/magento/module-sales/Block/Order/Email/Items.php b/vendor/magento/module-sales/Block/Order/Email/Items.php
index ddce387b910..e11981285f0 100644
--- a/vendor/magento/module-sales/Block/Order/Email/Items.php
+++ b/vendor/magento/module-sales/Block/Order/Email/Items.php
@@ -11,10 +11,61 @@
  */
 namespace Magento\Sales\Block\Order\Email;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
 /**
+ * Sales Order Email items.
+ *
  * @api
  * @since 100.0.2
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param OrderRepositoryInterface|null $orderRepository
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?OrderRepositoryInterface $orderRepository = null
+    ) {
+        $this->orderRepository = $orderRepository ?: ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Returns order.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So order is loaded by order_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return OrderInterface|null
+     */
+    public function getOrder()
+    {
+        $order = $this->getData('order');
+
+        if ($order !== null) {
+            return $order;
+        }
+        $orderId = (int)$this->getData('order_id');
+        if ($orderId) {
+            $order = $this->orderRepository->get($orderId);
+            $this->setData('order', $order);
+        }
+
+        return $this->getData('order');
+    }
 }
diff --git a/vendor/magento/module-sales/Block/Order/Email/Shipment/Items.php b/vendor/magento/module-sales/Block/Order/Email/Shipment/Items.php
index a4c9a7b80a0..1f9b353180f 100644
--- a/vendor/magento/module-sales/Block/Order/Email/Shipment/Items.php
+++ b/vendor/magento/module-sales/Block/Order/Email/Shipment/Items.php
@@ -6,6 +6,13 @@
 
 namespace Magento\Sales\Block\Order\Email\Shipment;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
+
 /**
  * Sales Order Email Shipment items
  *
@@ -15,6 +22,36 @@ namespace Magento\Sales\Block\Order\Email\Shipment;
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var ShipmentRepositoryInterface
+     */
+    private $shipmentRepository;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param OrderRepositoryInterface|null $orderRepository
+     * @param ShipmentRepositoryInterface|null $creditmemoRepository
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?OrderRepositoryInterface $orderRepository = null,
+        ?ShipmentRepositoryInterface $creditmemoRepository = null
+    ) {
+        $this->orderRepository =
+            $orderRepository ?: ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+        $this->shipmentRepository =
+            $creditmemoRepository ?: ObjectManager::getInstance()->get(ShipmentRepositoryInterface::class);
+
+        parent::__construct($context, $data);
+    }
+
+    /**
      * Prepare item before output
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
@@ -25,4 +62,54 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
         $renderer->getItem()->setOrder($this->getOrder());
         $renderer->getItem()->setSource($this->getShipment());
     }
+
+    /**
+     * Returns order.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So order is loaded by order_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return OrderInterface|null
+     */
+    public function getOrder()
+    {
+        $order = $this->getData('order');
+        if ($order !== null) {
+            return $order;
+        }
+
+        $orderId = (int)$this->getData('order_id');
+        if ($orderId) {
+            $order = $this->orderRepository->get($orderId);
+            $this->setData('order', $order);
+        }
+
+        return $this->getData('order');
+    }
+
+    /**
+     * Returns shipment.
+     *
+     * Custom email templates are only allowed to use scalar values for variable data.
+     * So shipment is loaded by shipment_id, that is passed to block from email template.
+     * For legacy custom email templates it can pass as an object.
+     *
+     * @return ShipmentInterface|null
+     */
+    public function getShipment()
+    {
+        $shipment = $this->getData('shipment');
+        if ($shipment !== null) {
+            return $shipment;
+        }
+
+        $shipmentId = (int)$this->getData('shipment_id');
+        if ($shipmentId) {
+            $shipment = $this->shipmentRepository->get($shipmentId);
+            $this->setData('shipment', $shipment);
+        }
+
+        return $this->getData('shipment');
+    }
 }
diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php
index e6d528fb93a..c27afe9fb5b 100644
--- a/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -17,7 +17,7 @@ use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\DataObject;
 
 /**
- * Class CreditmemoSender
+ * Sends order creditmemo email to the customer.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -108,7 +108,9 @@ class CreditmemoSender extends Sender
 
             $transport = [
                 'order' => $order,
+                'order_id' => $order->getId(),
                 'creditmemo' => $creditmemo,
+                'creditmemo_id' => $creditmemo->getId(),
                 'comment' => $creditmemo->getCustomerNoteNotify() ? $creditmemo->getCustomerNote() : '',
                 'billing' => $order->getBillingAddress(),
                 'payment_html' => $this->getPaymentHtml($order),
diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php
index 79133af6d6f..05164d1b7b5 100644
--- a/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -17,7 +17,7 @@ use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\DataObject;
 
 /**
- * Class InvoiceSender
+ * Sends order invoice email to the customer.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -108,7 +108,9 @@ class InvoiceSender extends Sender
 
             $transport = [
                 'order' => $order,
+                'order_id' => $order->getId(),
                 'invoice' => $invoice,
+                'invoice_id' => $invoice->getId(),
                 'comment' => $invoice->getCustomerNoteNotify() ? $invoice->getCustomerNote() : '',
                 'billing' => $order->getBillingAddress(),
                 'payment_html' => $this->getPaymentHtml($order),
diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/OrderSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/OrderSender.php
index c67804475cd..a2d61c3b2d3 100644
--- a/vendor/magento/module-sales/Model/Order/Email/Sender/OrderSender.php
+++ b/vendor/magento/module-sales/Model/Order/Email/Sender/OrderSender.php
@@ -16,7 +16,8 @@ use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\DataObject;
 
 /**
- * Class OrderSender
+ * Sends order email to the customer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OrderSender extends Sender
@@ -125,6 +126,7 @@ class OrderSender extends Sender
     {
         $transport = [
             'order' => $order,
+            'order_id' => $order->getId(),
             'billing' => $order->getBillingAddress(),
             'payment_html' => $this->getPaymentHtml($order),
             'store' => $order->getStore(),
diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php
index 4dbc10308f3..3e8bbe6e57b 100644
--- a/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -17,7 +17,7 @@ use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\DataObject;
 
 /**
- * Class ShipmentSender
+ * Sends order shipment email to the customer.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -108,7 +108,9 @@ class ShipmentSender extends Sender
 
             $transport = [
                 'order' => $order,
+                'order_id' => $order->getId(),
                 'shipment' => $shipment,
+                'shipment_id' => $shipment->getId(),
                 'comment' => $shipment->getCustomerNoteNotify() ? $shipment->getCustomerNote() : '',
                 'billing' => $order->getBillingAddress(),
                 'payment_html' => $this->getPaymentHtml($order),
diff --git a/vendor/magento/module-sales/view/frontend/email/creditmemo_new.html b/vendor/magento/module-sales/view/frontend/email/creditmemo_new.html
index 5ae6f5f9d82..f475503528d 100644
--- a/vendor/magento/module-sales/view/frontend/email/creditmemo_new.html
+++ b/vendor/magento/module-sales/view/frontend/email/creditmemo_new.html
@@ -22,6 +22,8 @@
 "var store_hours":"Store Hours",
 "var creditmemo":"Credit Memo",
 "var order":"Order",
+"var order_id": "Order DB Id",
+"var creditmemo_id": "Credit Memo DB Id",
 "var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -82,7 +84,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
+            {{layout handle="sales_email_order_creditmemo_items" creditmemo_id=$creditmemo_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/creditmemo_new_guest.html b/vendor/magento/module-sales/view/frontend/email/creditmemo_new_guest.html
index 657de2aae20..d8a8a0baeca 100644
--- a/vendor/magento/module-sales/view/frontend/email/creditmemo_new_guest.html
+++ b/vendor/magento/module-sales/view/frontend/email/creditmemo_new_guest.html
@@ -21,7 +21,9 @@
 "var store_hours":"Store Hours",
 "var creditmemo":"Credit Memo",
 "var order":"Order",
-"var order_data.is_not_virtual":"Order Type"
+"var order_data.is_not_virtual":"Order Type",
+"var order_id": "Order DB Id",
+"var creditmemo_id": "Credit Memo DB Id"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -80,7 +82,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
+            {{layout handle="sales_email_order_creditmemo_items" creditmemo_id=$creditmemo_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/invoice_new.html b/vendor/magento/module-sales/view/frontend/email/invoice_new.html
index 68773ee9d75..c4818172449 100644
--- a/vendor/magento/module-sales/view/frontend/email/invoice_new.html
+++ b/vendor/magento/module-sales/view/frontend/email/invoice_new.html
@@ -22,6 +22,8 @@
 "var store_hours":"Store Hours",
 "var invoice": "Invoice",
 "var order": "Order",
+"var order_id": "Order DB Id",
+"var invoice_id": "Invoice DB Id",
 "var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -82,7 +84,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
+            {{layout area="frontend" handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/invoice_new_guest.html b/vendor/magento/module-sales/view/frontend/email/invoice_new_guest.html
index 5053ccc2ac6..c06630fd249 100644
--- a/vendor/magento/module-sales/view/frontend/email/invoice_new_guest.html
+++ b/vendor/magento/module-sales/view/frontend/email/invoice_new_guest.html
@@ -21,6 +21,8 @@
 "var store_hours":"Store Hours",
 "var invoice": "Invoice",
 "var order": "Order",
+"var order_id": "Order DB Id",
+"var invoice_id": "Invoice DB Id",
 "var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -80,7 +82,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
+            {{layout handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/order_new.html b/vendor/magento/module-sales/view/frontend/email/order_new.html
index 13c436b131b..a411e8d5b29 100644
--- a/vendor/magento/module-sales/view/frontend/email/order_new.html
+++ b/vendor/magento/module-sales/view/frontend/email/order_new.html
@@ -22,6 +22,7 @@
 "var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
 "var order_data.is_not_virtual":"Order Type",
 "var order":"Order",
+"var order_id": "Order DB Id",
 "var order_data.customer_name":"Customer Name"
 } @-->
 
@@ -90,7 +91,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_items" order=$order area="frontend"}}
+            {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/order_new_guest.html b/vendor/magento/module-sales/view/frontend/email/order_new_guest.html
index 866a1ad87f9..dc3a8e9f69a 100644
--- a/vendor/magento/module-sales/view/frontend/email/order_new_guest.html
+++ b/vendor/magento/module-sales/view/frontend/email/order_new_guest.html
@@ -21,6 +21,7 @@
 "var store_email":"Store Email",
 "var store_hours":"Store Hours",
 "var order_data.is_not_virtual":"Order Type",
+"var order_id": "Order DB Id",
 "var order":"Order"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -85,7 +86,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_items" order=$order}}
+            {{layout handle="sales_email_order_items" order_id=$order_id }}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/shipment_new.html b/vendor/magento/module-sales/view/frontend/email/shipment_new.html
index 39823a0c9d8..39397979d2a 100644
--- a/vendor/magento/module-sales/view/frontend/email/shipment_new.html
+++ b/vendor/magento/module-sales/view/frontend/email/shipment_new.html
@@ -23,7 +23,9 @@
 "var store_hours":"Store Hours",
 "var order_data.is_not_virtual": "Order Type",
 "var shipment": "Shipment",
-"var order": "Order"
+"var order": "Order",
+"var order_id": "Order DB Id",
+"var shipment_id": "Shipment DB Id"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -59,7 +61,7 @@
                 </tr>
             </table>
             {{/depend}}
-            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
@@ -86,7 +88,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/email/shipment_new_guest.html b/vendor/magento/module-sales/view/frontend/email/shipment_new_guest.html
index ed2f52ed850..54c7f085064 100644
--- a/vendor/magento/module-sales/view/frontend/email/shipment_new_guest.html
+++ b/vendor/magento/module-sales/view/frontend/email/shipment_new_guest.html
@@ -22,7 +22,9 @@
 "var store_hours":"Store Hours",
 "var order_data.is_not_virtual": "Order Type",
 "var shipment": "Shipment",
-"var order": "Order"
+"var order": "Order",
+"var order_id": "Order DB Id",
+"var shipment_id": "Shipment DB Id"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -57,7 +59,7 @@
                 </tr>
             </table>
             {{/depend}}
-            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
@@ -84,7 +86,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/module-sales/view/frontend/layout/sales_email_order_shipment_track.xml b/vendor/magento/module-sales/view/frontend/layout/sales_email_order_shipment_track.xml
index bbc7f04ce94..489317cfa65 100644
--- a/vendor/magento/module-sales/view/frontend/layout/sales_email_order_shipment_track.xml
+++ b/vendor/magento/module-sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -8,10 +8,10 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="sales_email_order_shipment_renderers"/>
     <body>
-        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml">
+        <block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml">
             <arguments>
                 <argument name="tracking_url" xsi:type="object">Magento\Sales\Block\DataProviders\Email\Shipment\TrackingUrl</argument>
             </arguments>
         </block>
     </body>
-</page>
\ No newline at end of file
+</page>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new.html
index 86e3cf01e96..f8e192bafdf 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new.html
@@ -20,6 +20,8 @@
 "var store_email":"Store Email",
 "var creditmemo":"Credit Memo",
 "var order":"Order",
+"var order_id": "Order DB Id",
+"var creditmemo_id": "Credit Memo DB Id",
 "var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -79,7 +81,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
+            {{layout handle="sales_email_order_creditmemo_items" creditmemo_id=$creditmemo_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new_guest.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new_guest.html
index d0310a8e2c7..4442c172a08 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new_guest.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/creditmemo_new_guest.html
@@ -19,6 +19,8 @@
 "var store_email":"Store Email",
 "var creditmemo":"Credit Memo",
 "var order":"Order",
+"var order_id": "Order DB Id",
+"var creditmemo_id": "Credit Memo DB Id",
 "var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -77,7 +79,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
+            {{layout handle="sales_email_order_creditmemo_items" creditmemo_id=$creditmemo_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new.html
index 636fa9ac5f4..c46f0b03a53 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new.html
@@ -20,6 +20,8 @@
 "var store_email":"Store Email",
 "var invoice": "Invoice",
 "var order": "Order",
+"var order_id": "Order DB Id",
+"var invoice_id": "Invoice DB Id",
 "var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -79,7 +81,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
+            {{layout area="frontend" handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new_guest.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new_guest.html
index 7df5ffe5f4a..6e35fd2609d 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new_guest.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/invoice_new_guest.html
@@ -19,6 +19,8 @@
 "var store_email":"Store Email",
 "var invoice": "Invoice",
 "var order": "Order",
+"var order_id": "Order DB Id",
+"var invoice_id": "Invoice DB Id",
 "var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -77,7 +79,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
+            {{layout handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.html
index 745bf5c9c2e..373db99d87d 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.html
@@ -20,6 +20,7 @@
 "var order":"Order",
 "var order_data.is_not_virtual":"Order Type",
 "var order_data.customer_name":"Customer Name",
+"var order_id": "Order DB Id",
 "var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL"
 } @-->
 
@@ -85,7 +86,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_items" order=$order area="frontend"}}
+            {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new_guest.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new_guest.html
index 907be4d45a6..024f6daf76a 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new_guest.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new_guest.html
@@ -19,6 +19,7 @@
 "var store.frontend_name":"Store Frontend Name",
 "var store_email":"Store Email",
 "var order":"Order",
+"var order_id": "Order DB Id",
 "var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -82,7 +83,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_items" order=$order}}
+            {{layout handle="sales_email_order_items" order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new.html
index 4ff9da3a31b..d1b1e1e3376 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new.html
@@ -21,7 +21,9 @@
 "var store_email":"Store Email",
 "var order_data.is_not_virtual": "Order Type",
 "var shipment": "Shipment",
-"var order": "Order"
+"var order": "Order",
+"var order_id": "Order DB Id",
+"var shipment_id": "Shipment DB Id"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -55,7 +57,7 @@
                 </tr>
             </table>
             {{/depend}}
-            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
@@ -82,7 +84,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}}
         </td>
     </tr>
 </table>
diff --git a/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new_guest.html b/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new_guest.html
index ac7eaae6b7f..18684fb052b 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new_guest.html
+++ b/vendor/magento/theme-frontend-luma/Magento_Sales/email/shipment_new_guest.html
@@ -21,6 +21,8 @@
 "var order_data.is_not_virtual": "Order Type",
 "var shipment": "Shipment",
 "var order": "Order",
+"var order_id": "Order DB Id",
+"var shipment_id": "Shipment DB Id",
 "var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -54,7 +56,7 @@
                 </tr>
             </table>
             {{/depend}}
-            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
@@ -81,7 +83,7 @@
                     {{/depend}}
                 </tr>
             </table>
-            {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}}
         </td>
     </tr>
 </table>