Add missing time [tmp, TODO: test]
Merge branch 'master' into add-missing-time
Test [tmp]
AddMissingTime working