Firewall.rb merge 3.8 ON hacks to 4.4 part II