[NTK-514]

[NTK-514]