attempt at merging changes to service gateway spec