Merge branch 'benchmark_timeline' into 'develop'