[NTK-215]

[NTK-215]