Merging changes from recovered repo.