> > Unfortunately, current version of this patch has some conflicts, could
> you
> > rebase it?
>
> Given this patch has not been updated, I'm marking this as returned with
> feedback.
>
Here's a rebased patch that works with the latest master branch. Very
straightforward.