I feel sorry for the noise, switching this patch there and back. But the patch needs rebase again. It still applies with -3, but do not compile anymore.
Best regards, Andrey Borodin.
The new status of this patch is: Waiting on Author