FileLister fix - merging back missing upstream changes