improve CharStreamUtil, ObjectIdentifier
merge coflicted files