Merge "Fixing self-assignment in cloning code."