Yet another rebase @ f5a987c0e5

Best regards,

Maxim Orlov.