[NTK-842]

[NTK-842]