Revert "Revert "TimeLine fixes""

This reverts commit cec548fadfba0e7f223d6db76c18983426d11745.