[NTK-618]

[NTK-618]