Merge branch '2278_preserve_attrs_if_dest_exists'