Don't see any of the D10 issues, so I created my own patch here. Still needs testing
Needs review
Code
Noticed that dispatch() parameters are in the wrong order, attaching a fixed patch