[HMDNV-357] HMDNV-357