Merge "Add item type value to a CHECK call" into main