[NTK-519]

[NTK-519]