[NTK-090]

[NTK-090]