Merge "Allow excluding directories during scan"