Do not use missing File.dir?
Merge branch 'bug/file-dir-crash-in-watcher' into release-3.6.x