Merge "Always use a positive value for timestamp"