CMS-3986 International character encoding problems