Merge "Handle out being a symlink"