IGNITE-788

[Artiom Shutak]

Hi Gianfranco,

I've done a review of ignite-788.

Can you please look on my review (see comment at jira and new attached
patch file). Let me know what you think.

-- Artem --