Merge "Only open a path that is a regular file" into main