Merge branch 'rs/convert-fix-utf-without-dash'