Merge pull request #5646 from Starsam80/cert-import-fixes NANDImporter: Improve certificate extraction
