[NTK-556]

[NTK-556]