Please review my PR 4968 (IGNITE-9738)

[V.Pyatkov]

D.Govoruchin, 

I tried to correct all your comments and TC in correct state.

Please, review my changes.

--