CMS-4164 Auto-generation of name when writing display name is broken