Reapply the multi-ip code

This patchset reapplies the multi-ip changes with a fix that corrects a bug in translating old syntax to new syntax.