Merge pull request #4717 from nickberry17/mm_proto