[HMDNC-526] HMDNC-526