[NTK-631]

[NTK-631]