[NTK-025]

[NTK-025]