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