Merge branch 'benchmarks/favourites_timeline' into 'develop'