[NTK-857]

[NTK-857]