[NTK-237]

[NTK-237]