[NTK-689]

[NTK-689]