Hi Guix,

It looks like QA is still pending here. Probably it needs to be rebased on
a fresh master HEAD. Please, let me know if I need to send v3.

Thanks,
Oleg