Issue #23284:correctly handle itemsite_supply_itemsite_id
Merge pull request #331 from garyhgohoos/23284

Issue #23284:correctly handle itemsite_supply_itemsite_id