Merge from 'iptables' branch