[NTK-497]

[NTK-497]