Merge branch 'improve-partial-utf8-handling'