[NTK-825]

[NTK-825]