[NTK-498]

[NTK-498]