Merge "Timestamp Truncating whitelist."