Merge: Clean UTF-8 string update