Merge "Sanitize path before querying for ScanFile" into rvc-dev