Merge "Fix parsing of extension string" into mnc-dev