Merge branch '2787_relative_symlink_crash'