Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev