GOMA shapers overhaul C5

Description of repair:

GOMA shapers overhaul C5