Merge "Handle firewall_driver option"