Rename the time netcdf variable to data_time.
Merging different changes.