Merge "Fix_Old_Vulnerabilities_in_PathFinder"