Improved interruption.
Merge branch '3.interruption' into 3.0
Improved interruption.