[NTK-821]

[NTK-821]