[NTK-847]

[NTK-847]