Merge pull request #5226 from stangri/master-firewall