Merge branch 'reentrent-timing'