Merge "Fixes image create utf-8 multibyte test"