[NTK-487]

[NTK-487]