[NTK-518]

[NTK-518]