EPD-302: Support for MSI-NM attachments