Issue #23284:correctly handle itemsite_supply_itemsite_id
Merge pull request #1391 from gpazo/23284

Issue #23284:correctly handle itemsite_supply_itemsite_id