Merge pull request #9139 from annando/timeline-parameters