[HMDNV-599] HMDNV-599