Incident #: 20734 - Add Shipment and Order views, workspaces, etc.