#13406: fix more deprecation warnings and move the deprecation of unicode-internal earlier in the code.
Attach a file by drag & drop or click to upload
