[NTK-629]

[NTK-629]