CMS-2587 Persist Attachments of Entity