[NTK-533]

[NTK-533]