Merge "Refactor interface IP code into InterfaceController"