More implementation for lazy loaded timeline's events
Merge remote-tracking branch 'origin/master'