Merge "Refine firewall-related commands"