EPD-302: Proper formatting of MSI-NM messages