Merge pull request #4888 from leoetlino/good-bye-singleton Get rid of a singleton for NAND shared contents
