Merge "Further interruptiveness changes" into pi-dev