Merge "Fix symlink handling during backup"