Timestamp generation changes