[HMDNV-613] HMDNV-613