Merge "Don't crash on invalid datestamp" into nyc-dev