Hi Ihor,

I've implemented this proposal in the patch attached.

Does it look good to you ?

-- 
Sébastien Miquel