[NTK-131]

[NTK-131]