Merge "Fixed FileTreeIteratorWithTimeControl"