Merge pull request #2582 from castillofrancodamian/firewall