[NTK-841]

[NTK-841]