Merge pull request #2007 from nabinhait/hotfix

Activity: fix for timeline-wise display