Improve handling of File.parent
and File.name
#9642
Merged
File.parent
and File.name
#9642