faster timeline construction
Merge origin/master