[HMDNV-387] HMDNV-387