Enable 'firewall' module
Merge branch 'firewall' into develop