Merge "Make recordUpload2() deferred updates PRESEND again"