[NTK-563]

[NTK-563]