Merge "Firewall-related commands porting"