[HMDNV-473] HMDNV-473