For #25387 - Non-ascii characters are now handled correctly on OSX & Windows