Merge pull request #3534 from Karlson2k/cfile_fix_01