Merge branch 'es/utf8-stupid-compiler-workaround' into maint