[NTK-517]

[NTK-517]