Merge branch '3093_keep_symlink_cwd_startup'