Merge pull request #3736 from BhaaLseN/issue-9135 Rewrite NAND Content handling in ES to fix Issue 9135
