Fix critical filelist infinite loop race
Merge pull request #14345 from makinacorpus/2014.7

Fix critical filelist infinite loop race