Merge "Don't fatal on invalid timestamps"