Adding support for --forwarder and --no-forwarders