[HMDNV-606] HMDNV-606