Merge "Add multi-instance state to item infos" into main