[NTK-569]

[NTK-569]