[HMDNV-497]

[HMDNV-497]