Update type_index from master.
Update type_index from master.