#919519 Revise d/p/path-issues.patch