[NTK-831]

[NTK-831]