[NTK-359]

[NTK-359]