Fix error. Add align-time.
Merge branch 'fix-timeline' into iow-testing