am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all...
am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
* commit 'a9473881':
Use the same interrupt/resume logic for all functor calls