Merge "Rename NumberOfSegment to NumberOfSegments."