[NTK-633]

[NTK-633]