[NTK-844]

[NTK-844]