Review and merge IGNITE-10921

[Stanislav Lukyanov]

Hi Igniters,

Can anyone please review and merge IGNITE-10921?
Artur Muradimov contributed the change, I did a review myself and now we need a 
committer to finish this.

Thanks,
Stan