Merge "Fix cases of attachments with no name"