[HMDNV-487]

[HMDNV-487]