Merge branch 'tmbinc/FixTimingBugs'