Merge branch 't/timing_improvements'