Merge branch '2101_skip_directory_scanning'