Merge "Track change of type from short -> int"