Add fallback for old flows
Merge branch 'ignore_missing_timestamps'