Merge "Abort the update if there's not enough new data"