Merge "Move conversion from ISO-8859-1 to UTF8 after applying patches"