master
Squashed commit of the following:
removed commented line
Port to 102X branch of new MTD software, part2