Firewall should be on by default
Merge branch 'refs/heads/master' into release