Gateway different port support and bugfix
GatewayInitiators removed