Deprecate Gateway functionality as it's being removed from core
Better configuration story