Feature/ngm 1079