Merge "Fix incorrect path name check."