[GRCH-356] GRCH-356