Merge "Fix regression in directory scanning"