Merge remote-tracking branch 'remotes/github/MAGETWO-97260' into EPAM-PR-34

Author: VeronikaYarats

app/code/Magento/Sales/Model/Order/Shipment.php

@@ -356,12 +356,11 @@ public function getTracksCollection()
         if ($this->tracksCollection === null) {
             $this->tracksCollection = $this->_trackCollectionFactory->create();
 
-            if ($this->getId()) {
-                $this->tracksCollection->setShipmentFilter($this->getId());
+            $id = $this->getId() ?: 0;
+            $this->tracksCollection->setShipmentFilter($id);
 
-                foreach ($this->tracksCollection as $item) {
-                    $item->setShipment($this);
-                }
+            foreach ($this->tracksCollection as $item) {
+                $item->setShipment($this);
             }
         }