[NTK-238]

[NTK-238]