Merge "Fix add single character check" into ics-mr1