[NTK-834]

[NTK-834]