Issue #23666:correctly populate unitcost
Merge pull request #358 from garyhgohoos/23666

23666:correctly populate unit cost