More accurate timed interruption.
Merge branch 'master' into force