Merge branch 'tb/drop-dir-iterator-follow-symlink-bit'