Merge pull request #1159

M0/M1 Message Fix