[NTK-502]

[NTK-502]