Merge branch 'dd/time-reentrancy'