[GACHIG-831] GACHIG-831