Merge "Fixes in directory search ordering"