[HMDNV-684] HMDNV-684