Fixed wrong FileInfo check
Merge branch '2.8'