[NTK-488]

[NTK-488]