[NTK-110]

[NTK-110]