Merge pull request #3641 from erozenfeld/GetCORSystemDirectoryInternaLFix