[HMDNC-528] HMDNC-528