[NTK-798]

[NTK-798]