Update to newest ipf
Merged with current ipf

Performed 3-way merge between ipf 8.1, ipf 9.2, and ipf_3. Please ensure
that edits are made from recent versions to avoid such issues.