Merged datafile upload changes