[NTK-828]

[NTK-828]