Issue #22467:use relocateInventory function