Merge branch 'bc/utf16-portability-fix'