[NTK-216]

[NTK-216]