Sorry, attached the old version of the patch by a mistake.
Here's the updated version.

- Artyom