Post Purchase Upsell Issue: Confusing Shipment Notifications on Shopify

Has anyone found a solution to this Post Purchase Upsell issue:

Shopify Thank You page seems to always break out the additional item added via Rebuy Post Purchase Upsell widget into its own "shipment"
Even though in Shopify admin, there is only one shipment/fulfillment order (including the add on product)
But its confusing for customers who now think they are getting multiple shipments....