[NTK-671]

[NTK-671]