Timing improvements
Merge origin/master