Merge branch '2910_patch_symlink'