add fallback for timestamp in date type
Merge remote-tracking branch 'remotes/origin/timestamp-fallback'