merge mtd fis table changes from r17657-r17660 to 8.09 to provide a better upgrade...