[HMDNV-397] HMDNV-397