[GRCH-345] GRCH-345