Merge "Remove begin/commit from recordUpload2()"