[HMDNV-626] HMDNV-626