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