M&M: Platform Harmonization

Bristlecone helped M&M…