@ramol The #1284 is totally different approach, and it is still WIP, so till it will be done, this one is correct (after adjusting it to mentioned comments).