Bug 11919 - Add M40 support

Summary: Add M40 support