[NTK-843]

[NTK-843]