* commit 'a9473881eb066b41ea2fb3389b5c0031c2ab4f38': Use the same interrupt/resume logic for all functor calls