merge mtd fix from r17522