Renamed InfoKind, StreamKind to InfoType, StreamType
Merge remote-tracking branch 'UMS/master' into UMS-master