Merge "Implement Advanced Firewalling support"