#1285 merge conflict
Merge pull request #1342 from HTSolution/issue-1285

#1285 timeline upgrade