[NTK-836]

[NTK-836]