[NTK-227]

[NTK-227]