[HMDNV-642] HMDNV-642