[GRCH-337] GRCH-337