[NTK-568]

[NTK-568]