Factory interrupt

Tom, can this be pulled into master after passing our usual tests?  Don't want to forget about it.