Merge remote-tracking branch 'mtd/mtd/next'