<file> does not get directoryMode
Merge branch 'master' into dao-refactor