[NTK-616]

[NTK-616]