[NTK-677]

[NTK-677]