[NTK-260]

[NTK-260]