[NTK-636]

[NTK-636]