Merge pull request #5228 from stangri/19.07-firewall