Merge "Finish the new data receiver when update fails"