[NTK-833]

[NTK-833]