Merge from Perforce
Randomly assign a value if the time is None
Modify some script issues