[NTK-654]

[NTK-654]