Merge pull request #6161 from leoetlino/nand-check-improvements Improvements and important fix for NAND checks
