Merge "Tweaked timestamp kludge logic in recordUpload2"