[NTK-887]

[NTK-887]