port 741d4e9 to master -- fix start and end times for xport