[NTK-647]

[NTK-647]