Merge "Extracted text problems" into ics-mr1