Merge the new NAND code (testing-NAND brach); see doc/README.nand