Merge "Allow verify in specific subdirectory"