Merge "Update `container` for ItemInfo." into tm-qpr-dev