[GRCH-366] GRCH-366