Merged Sunil's firewall patches.