Test build: [fix] Properly separate upnp and firewall