Merge branch 'dn/test-reject-utf-16'