Merge pull request #11696 from neheb/mtd