[HMDNV-608]

[HMDNV-608]