[HMDNC-527] HMDNC-527