Merge "Fix Fortify Path Manipulation Issue"