fix: timestamp before 1000AD
Merge branch 'master' into aggressive
merge master