Merge pull request #5187 from alexrp/debugger-fix-callback-signature