[NTK-226]

[NTK-226]