Merge "be a bit more defensive when parsing extension strings" into ics-mr1