CMS-2587 Persist Attachments of Entity
Corrected error: Attachments not included when creating BaseBuilder from EditBuilder.build