Commits in sup/mainline:fix-utf8