[HMDNV-624] HMDNV-624